adapt test to work with the new implementation using criteria