fix space name tests, reverse merge