Don't spin the CPU so much in tests
Merge remote-tracking branch 'archon/master'
pull request cleanup #6