adding token authenticate
update fixture
fix test to reflect changed fixture
Merge branch '1.6-token' into 1.6