Improved boatbuilder test