Cleaned up module data functions so they only need a url param
cleaned up tests so they only use a url param in the method calls