Make mistakenly-committed tests pass