Fix tests, SORRY about that