Refactor and Red corrected testcase