Changed the unit test and e2e test config.