require token param, simplify some tests