More fixes to make testing work...