Add tests, coverage improvement.