Fixed authorisation listener issue

- Fixing tests pending