Minor changes to testing directories