Test refactoring according to the structure changes