#15 minor tidy to DataSourceSpec
#15 further tests for DataSource