Added Junit Tests