Nicer code/approach in ubiquity test.