Move ProjectTest into Controller test