Use JUnit 4 assertions instead of JUnit 3.
Merge pull request #15 from asheldon/develop

Use JUnit 4 assertions instead of JUnit 3.