Tests updated with full data set - all passing