Updated with model render tests