Fix for failing unit tests, still dependent on updated fix to OOZIE-674