Fix tests some more