DataSets which are derivatives copy properly

[#56320646]

https://www.pivotaltracker.com/story/show/56320646
Some refactoring in Activity spec