Fixes AccountService Unit Tests