Split test cases in different files, Jalo started