Adapt test cases a little bit