[cleanup] Clean up test and use expected data set for assertion