bug952301 - Export methods and enable them on unit test