New tweaks for tests