Fix tests for additional warnings added by the previous merge