Moses fix UTest

previous fix to build break actually broke a unit test.  So instead, implement the correct, working fix.