stats now ok, tests ok