feat(HAL): Completing Category HAL transition
test(HAL): Fixing tests