Added some Junit tests