Split up some test cases
2 files changed