Some minor resorting, plus started the refresh token happy case test.