Test script now uses env vars