reindented test otherwise unmergeable