Continue JUnitTest + correction of some bugs