Revert
Added tests for SCL-807