Ok i will refactor the test cases.