Merge of in-progress Eval API test code to the mainline.  Not much
here yet.