Fix tests

Let's give them a try, mm? :)