refactor some rendering, unskip and fix a test, closes #1616