fixed boat test wrapping
merge
Merge branch 'master' of https://github.com/justinobney/barge-scenario-prototype