Fixed c-testing issues.