Tests disabled and still trying to sort things out.