reorganized for clarity; made findall find more than 0; made update test more robust