RTBKIT-504 

Please do not merge yet as more test will follow.