Modifications to Junit test