Merge "Unit test for ChampDataService.java"