Merge "Add smoke/health tests to OSM stage_3"