removed static cpp config; cpp unit tests passing