tweaked json model, added test project