Responsive refactoring
Unit test refactor
More tests