fix tests for now
merge
Conf changes for e2e tests and added route provider