Rename to test include expanded criteria