Merge "Fix test mapping conflit of class vs. package"