Revert "test support"

This reverts commit 8465b4a29fb49cea9ebf3226cd20bf2266d52d00.