Finish exercise 8.5.1
Decouple tests