Remove more test output and choose whether to use Python or C++ version