Use traits to build factories for data points and refactor Sample Specs