GM: Added return url argument
GM: Fixed failing tests