Added some CBV tests