Fixes to allow running Tests 03 fedena classes