removed some fields from accounts and updated tests