Changed tests according to exercises of chapter 5