updates to the CBV testing.  Added helper methods.