fixed the tests as suggested by amatar