Removing some C warnings, fixing a test