Fix tests a bit