more tests for golfcourse
Merge branch 'Andrew-branch'