JAL-629 Test tidyup