Addition of mock test, comments, some name changes and necessary
encodings on URL paths