Added all but one test