Made project factory more automatic
Got the tests working again