Tidy up testing section.