Cleanups for storage engine patch. Changed two test results to now reflect the changes in storage engines and a couple of comment changes in the code.