Fix broken tests to match fixed code