Rewrite some accounts tests.#2