simplified schema to assume everything in cm and grams, updated tests