fixing basic urls
resolve merge conflicts
adding testing fixtures
adding testing fixtures