Migrate junit tests from 3.x to 4.x:
* Use annotations
* Use org.junit.* instead of junit.framework.*
* Small code cleanups
Merge pull request #12 from SvenBunge/JunitMigration

Migrate junit tests from 3.x to 4.x