Better logging for errors in some tests Upstream-commit: d7b341bc06c880efbc015b6cf75e69638800ff4b Component: engine