SPDX improved check logic and added tests

[DavidSouther]

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.