Refractored project tests