fixed issues with parallel testing