Improvments in tests
Naming refactoring