Revert "Revert "MyAccount test changes""

This reverts commit 1dcbfbf5c23a5e0275c969921494d0377c119d73.