completely removed short os name as it is useless
update expected test files