Refactoring
All tests running