refactoring, added account objects to integration test