ERT-530: Changes to test due to moved lock file