Cleanup: render tests merge, new format, pass more linting