Maded properties virtual to allow mocking.

[Matthew-Wise]

Also fixed some of the tests (I assumed the code was correct)

Hope this is the correct branch to target :)