Refactoring test runs to support shunt bug fixes.