try to fix some tests