Making Tests Passed again