Fix leaking variables.
Also improve testing for firefox #67