More fixes to the account_type tests