PopulateCriteria : Got most of the errors out. Still have four lines commented out.
PopulateCriteria should be done.
Changed comparison method.
Commit test.