Update unit tests and simplify rendering further