fixes remaining tests