Flaked it a bit

Conflicts:
	hostinfo/host/tests.py