Fix unique names where names that were supposed to be different could end up the same.
Split system-tests into 3 separate groups