Fix tests
Merge branch 'jquerydata'