Added test data makers and a couple of tests