Zero or More rule with tests; removing old implementation