amended tests, started refactoring methods to not call each other