Fixed persistently failing tests by weirdly manipulating the order of
the YML fixture data and ensuring test image dirs are clreaed on
tearDownOnce().