refactor more tests