Add tests for alternative data subsitution