Reworked yet again to separate 'basic' find from 'complex' find tests.  Broken complex test at this time
Updated lots of crud tests.. everything passes right now