Style v5; fix render tests