All tests (except those that tested functionality which has been removed) are now passing.