Updated some Tests