Attempt to fix some tests