Added more complex tests to sample criteria