removed crosstest
fixed token bug