Fixed the account controller and tests.