Fix tests to conform with new method of detecting OS'.