Backing out $TEST support since I forgot about changes in #323