Move tests to individual files