PEP8. if not url rather than only if it's set to None. Rewrite some of the assertions. One test not yet passing.