Cleaned up tests.
Merge pull request #28 from arb/tests

Cleaned up tests.