Add functionality to check if the Remedial Content should be present for a display depending on the test options. Few minor changes.