Follow up recent render system refactoring PRs (split test code), and fine tune the math render (added some new cases)
