Working on spec issues w/test data