Change types of optional test parameters to Optional<>