Fixes to allow running Tests 02 finance classes