Added new Account & User tests, cleaned up test project