Fix tests even more