Removing debug and adding c++ test