More fixes to the testing code