Refactoring ended with completing test