Should I move the test cases to FileSuite?