Bugfix/broken tests

:+1: