Update unit tests for skipping OPTIONS message