[FIX] Functional test new urls
[FIX] Some more functional fixes
[FIX] Rollback to broken merge
Merge pull request #29 from arescope/fix-functional-tests

Fix functional tests