Tidy up configuration tests