Smoke test, part deux [IMMUTANT-247]