more debug output
increase timeout to fix buildbot errors
Merge pull request #1254 from ifreecarve/2013-07-11_test_fixes

Fixes to tests