Tests fixed, with render fix