Improve tests and fix json descriptor validation bug
Rename file
Fix some JavaDoc