Merged changes from Workflows branch

Created one merged branch with both the workflows and data collections
added, along with the data files for the test.