INFRA-124 - Facilitate parallel testing by making test environment more flexible