Trond merge (and a fix for make test)