Update some of the BSS unit tests
Merge pull request #1255 from markewallace/UpdateUnitTests

Update some of the BSS unit tests