1. added rawurlencode
2. changed test data accordingly