Added Junit testing