Bug fix for make test