Update tests to work with recent changes to backend.