Fix for failing tests

closes #1609
- added wait for output
- changed order of test tasks
Merge pull request #1612 from sebgie/issue#1609

Fix failing tests
Swap url.resolve for slash handling
Merge remote-tracking branch 'upstream/master' into whird.jpope.org