couple of test fixes after upgrading to a newer mocha/shoulda
fixes #1077 - Ensure that host OS attributes are related to the OS itself
Fixes #263 - Refactored Foreman to use correct singular and pluralization of medium/media