Make testing script use testing code again...