Initializing token controller before services
Method refactor
Adding macro for testing.