Split test cases into more methods