All tests now use the base

This allows us to use the requestWithToken
Change-Id: I563266b33e4dc984f77918015df5e52926c1b219
Merge "All tests now use the base"