adding fixes to certain tests