SONATA-307 - Added unit tests