reorg. test-packs & changed "windows" to "MS Windows"