Improve mapping for more functions.

Add tests based on git's 101 samples.