master
Use SPDX-License-Identifier consistently
remove unused imports
Condense test directory names for 1.9.