modified unit tests setup and updated javadoc