Fix rest of tests