Updated CustomInputDataHandler for test functional