SONATA-261 - Fixed tests