added more Junit Tests