Begin using durable_decorator and fix specs.