Few cleanups in infrastructure

Refs #6
- Makes test pass
- Removes deprecated Junit usage
- Adds some JavaDoc

Closes #7