cleaned up tests, improved exception
Merge pull request #3 from grimborg/master

cleaned up tests, improved exception
merged