failing less tests now, still not perfect