Made changes for specifying test data as a System Property.