Also includes a drive-by fix that makes integration tests for plot
blocks more robust.