Reinstate some tests lost in recent refactoring.