fuckin tests.
Merge pull request #402 from jessevondoom/master

electric boogaloo