Merge "Remove calls to setAccount and getAccount in test"