Refactor test cases to allow more files / suites