added data test cases
reorganized test folder