Merge "Remove AccountsTester" into nyc-dev