Fix OPTIONS to pass tests