Get windows data merged properly.
Run the tests from the working tree, simplifying combining later
Remove support for COVERAGE_OPTIONS environment variable.