Make sure the tests are not run in parallel in NCrunch, various small fixes