Convert to use PyFxA
Add tests