We pass unit tests now, but the figures are broken
improvements to tests