Remove FxA waffle, add Native FxA waffle
fix tests
remove debugging lines