Switch remaining test scenarios to using underscores instead of hyphens

For consistency with Micro AI scenarios both here and in mainline