Fix C++ 022. Remove VB tests for the moment