added template views limitations, fixed outstanding tests