More messing about with test data
Second draft from Dr Pang and more test stuff