Move tests to correct directory, forgot to include java in path.
Rename phases.