ok, really fix tests this time :)