Some cleanup and a stable accounts/me test