tried to fix some tests