Completed tests, refactored some method names