updates to sample data, couple of fixes to tests to reflect data changes