954038 - minor changes to fix unit tests