Adding unit tests for HHH-7881