Increment version
Fix module name
Fix test module name
Restore to_json