Changed tests as per exercises 5.6