Attempt to fix failing tests