Start covering etcdbackend by tests, cleaning up