Better test for special case state