Tried fixing unit tests under certain condition again.

	Oddly, still doesnt work under that condition...