Obstacle tests updated (using tower now, since that's what the codebase is using).
Merge remote-tracking branch 'origin/master'