Cleaned up tests a little
Refactored project name eval slightly