Improve rendering and tests