All tests passing on Windows, gcc + msvc. Changed convenience_test to eliminate chance of test directory name race condition when multiple tests run together.