working on the main module
Implement the tokens by user resolver
tweak tests