More tweaks for testing