Unit tests working for both cpp and p