fixed issue with URI encoding, and created test data for use with the same