Fixed issue where jsonp functionality wasn't working
Updated unit tests