Updating a few minor items in the tests and read me to clean up the approach a little.