Now finished all refactorings in Peter's pdf
Trying to refactor the tests