Final Version with class of test