[feature/oauth] Refactor test to provide for easier to read tests

PHPBB3-11673
[feature/oauth] Fix remaining issues with token storage

PHPBB3-11673