Security token and a few testing updates