final junit + some fix