HV-912

Add unit test on top of Gunnar's previous work