More code, trying to get DotsTest to pass again.