Fix tests

Ok this way too, though. Might start failing some day, but lot easier to fix then.