fixes failing tests

see commit

(does this need another version, changes?)