Fix deprecated jUnit imports and methods
Merge pull request #319 from psiroky/junit-fix-deprecation

Fix deprecated jUnit imports and methods