Fix tests that were broken