Fixing resource loader location for AMEC-2246
Adding logging for the unit test and some general cleanup AMEC-2246
Merge branch 'dev-AMEC-2246' into release/2.9.5rc