Remove test-specific code obviated by bd91021