Refactor short format test cases