Collapsed repeated conform test code
Collapsed repeated conform test code

Conflicts:
	test.py

openaddresses/machine,openaddresses/machine,slibby/machine,slibby/machine,slibby/machine,openaddresses/machine,slibby/machine