WIP test fixes

Conflicts:
	app/models/host/managed.rb