Further tests & move access tokens to separate model