Merge "Add Marconi Smoke Tests"