#1945 and #1535 tests added