Refacted TestCases