refactoring tests of Week1