Test Class Fixed. Comments almost complete