Upstreamsync

Parallelization and fixed the JUnit output for parallelized runs.