Merge "Adds basic Marconi test"