regression test fix for recent Optional<T> changes