Fixes to allow running Tests 01