Rename tests directory to test
Move tests to the end