Cleanup.
Check consolidated values are correct.
Improved tests.
Simplified test.
Do not wrap when not needed.
Refactored clojure examples.