Well, if we trash something..

- At least make sure the sleep deprived state doesn't result in a state
  where testing is forgotten.  Ensure the the required checks are also
  saved.  Fixes error introduced in 5a5e36e63365.
Ensure that features don't break tests

- Ensure that the test also use the dogfood introduced to allow them not
  act like they are broken.
- Fixes errors in 337025d4f67a and 8339433acbe0.
Ensure old behavior is also not broken.