more tests and more json return classes