replace whentrue with findall, two tests passing, closes #72