Cleanup: render tests merge, new format, pass more linting
made sure all the servers restored themselves