Starting to add test case for short mode.