Added test for #933
Translated #933 test to c++
Narrowing down #933
Resolving #933
Cleanup #933