beef up test cases