Adding output control and a check that the test exist.