Fix bracket matchups
Correct test server URL
Merge remote-tracking branch 'upstream/master'