Simplify test suite
Merge pull request #29 from ddeboer/tests

Simplify test suite