More test data refactoring
More test data refactoring
Made README example up to date with API