more quantities, use validator on inputs, extend tests