Add some criteria tests