Added additional test; changed count to find (#3178)