Added optional dependency on org.junit

Change-Id: I90db0ab4bca56a42119cd6bfb47a31ffa805da28