fix logout in FF, more work on tests