Add debug support for contrib/test
Merge pull request #204 from pmorie/debug

Add debug support for contrib/test