Added another test and JSON convenience class