Refractoring + Project Tests