Added further configuration changes following the first test run