update config files, add unit tests and E2E tests