Simplified test_support, now it only redefines what is missing