Cleaned up test
Merge pull request #19 from arb/test-clean

Cleaned up test