tidy up test page, genericise cups + more ingredients.