Integration test fix

* oscodename should not have been removed.
Merge pull request #9465 from cachedout/unit-tests

Integration test fix