Make tests more flexible.
Can update account.
Refactor UrlBuilder.