Reinstate a few more tests lost during refactoring.