trying to fix failing tests