modify TYPE-OF-EXPRESSION function and its related functions and tests