Some minor arrangements...
Adding test coverage for AccountService.

* Using IClock interface to test time stuff...
* Fixed faulty code thanks to the tests! Woo!
Some silly test changes.
Tidying up more tests, and getting them to pass :(
More silly changes.