Fix tests for accounts