fixed a few more tests to work concurrently