Fix logic in 2 failing tests.