refactored some method names to match testing convention