Extract from big class to small class and add test case