HAMA-681: Fix test cases