Cleanup of debug and fix tests
Merge pull request #193 from kchall/infrastructure

Cleanup of debug and fix tests