Try to fix failing tests