Fix some more BSD tests.
Merge branch 'master' of github.com:OpenLightingProject/ola