Update unit test to HRP 2