Fix tests according the lecture notes