Fixed Junit Tests