Testaccount beta & other improvements