Refactoring to HSpec and Project model