Add tests for Supply.do + some simplifications