FP-1283: refactor a bit to put the test and data together.