Modifications to handle limited test runs without causing a subsequent failed job on the slave.