! Add alias to use shortened class name in tests
! Initial version of mock proxy and helpers
! Added main helper factory
! Mock helpers implementation
! Fixing merge