Updating some of the existing java tests and adding a new one