Added Criteria projection
Enhanced test cases