Remove obsolete check
Test two additional special cases