a bit more test data and some rearranging