Add token-mock managment in tests
Update comments test to manage token-mock