Added some tests for MDL-40225 fix.