refactored more tests