4159: inlined test cases
4159: separated test methods