Fixed some Test Class errors