Merge "refactoring - adding junit"