Further testsuite wibbles following changes to kind suppression