Fix tests to correspond with new return data