refactored some tests and removed old methods