Added internal access to public api.
Unit tests for new feature in 2.3