Additional logging, test fix