remove like '
unit for criteria
add criteria tests
Merge