Tests reorganized
Tests updated
Update jsgen