Add features for test case #2