Removed tokens; fixed tests