stats and tests tweaks