modifications to test
Merge https://github.com/UCLAlexMartin/TestingWeek