Merged in changes that added unit test support by Joe Slag. Thanks!

Benjamin Mako Hill || Want to submit a patch?