remove unnecessary $(...) wrapping of test forms