Cleaning up C tests