Added some Junit Tests