Replaced Basic Authentication instead of Token.
Minimal testing/logger additions.