Add more junit tests