Test refactor
Merge pull request #232 from keyvanakbary/access-token-test-refactor

Test refactor