HAMA-681: fix test cases