[MARKET-161] - Added unit tests