Don't bother marking unix tests as 'skip' on Windows

We don't run the unix tests on Windows anyway.
Small testsuite refactoring; no functional change
Remove uses of compose(s) in tests