Updating integration tests to support shunt (CLIunit refactor).