Get rid of test.support module