Fixed bugs, AccountServiceTest all tests working

+ pimped code coverage