Trying to get it to work with any object
Fixed url unit tests