Merge some of the test cases
Add data frame and marshalling