Update SPDX license identifiers
Fix test suite
Allow for "proprietary" as license identifier