Fix tests for laziness, to squash