Added more flexibility to the test configuration