Reorganize configuration tests