More work on ProjectService and its tests