Tidy up some test section