More jUnit tests implemented