Test data now all in as per excel file.

Some werid bugs with displaying data appear to have got in though last week and we've not noticed them, going to have to poke around till I fix them.