Rework tests to handle new render process
New build