Remove OptionalExpandPipe and convert test to use new ExpandPipe