Added more unittests (also rewrote assert_url_correct)
Merge branch 'feature/unittests' into dev