NH-3260 - Add more tests.