Prepare release.
Fix API version.
Cleanup and simplify.
Add missing test files.