Merge "Fix tests and align error logging" into main