fixed conversion of Hamcrest test cases