Also moving everything into a fixture so we can use the same tests for token based authentication as well. Change-Id: I4f3ee0939268554ff2a92125655ce721171add06