Split basic tests and method tests
Order test files