Small tidyup of tests