Added test folder and implemented proper url-encoding