Checked in code for fix for Junit Test cases failures.