control-suite: remove packages after adding new ones

We have to add package before removing those no longer wanted. Otherwise
an old version could enter a suite without us noticing (as the old
version would already be gone and thus no version check violated).