cleaning up tests for all CBV based version