add criteria tests
add criteria or
Merge