ticket:1 refactored testcases, moved each test to separate file.