SSP-3013 Fix unit tests

Addresses various unit test regressions, all related to recent
updates to license headers.