Rearrange test folders because of Travis CI