Simplify/revise for use in pre-defined test data set