unit test fixes

follow pattern needed to fix unit tests found in enterprise spec.  Tests
now all pass