Class refactoring + unit test + test success