Done with refactoring tests