I've removed the need for the machine to be otherwise unused (and a test to ensure it works).

I suggest we take the option of adding container support separately.