Merge "Fix tests with the new enable logs" into pi-dev