Bug fixes and refinement during FxA testing