Removed the query string parsing/detection
Fixed tests since they were not correct