attempt to fix some tests