Updated tests & moved to MultiJson for more platform support