Added CPP test files. Minor developments in tracer.