Urls fixed
fixed tests.py
Merge branch 'dev'