added support for additional suites and enhanced debug output