Test clean up

Test clean up.
Addresses some stuff in https://github.com/mozilla/fxa-js-client/issues/65