minor changes; renamed TestProductReader to TestDefinition; used more JsonProperty annot; removed some not used methods