improve test and add missing unset