fixed tests after oauth merge