End of feature auto_mapping
Unit test bug fix