Refactoring for test 1.8