NH-3316 Failing tests

Failing tests for NH-3316