Adds JUnit library to test libraries.
Merge origin/master