Add a few criteria tests