Merge "Revert "Remove AccountsTester"" into nyc-dev