HIP-848 fixing tests