Re-enabled test and switched over to rely on the cpp implementation.