WIP verify for authorize modified. tests. refactoring in tests.