Again, add more tests
Refactor tests