add junit test and renaming