C++ Update and Tests