Refactoring of unit tests
Improving naming of test methods