Few more Junit tests