Changes for review.  Test data now moved to this repo from iris-sample-data.