Firefox fix + test cleanup