Fix some dead code/testing issues.
Merge pull request #186 from vibraphone/tweaks

Fix some dead code/testing issues.