Adds JUnit libraries back in.
Merge origin/master