fix some tests but not all