Consolidate crud/eval test resources, update tests accordingly