More tests + fix for negation of has_token