Fix failing unit tests
Make sure to leave the busted directory
Merge pull request #1362 from hawkthorne/fix_tests

Fix failing unit tests