Refactor test. Add functionality to forward requests for entries not in etcd.