Remove support for testing