Add more Junit tests