changed packages, wrote assert for removeToken