Make tests run in parallel
Small unit test fixes