Milestones  TestCases refactoring