Minor cleanup for test setup script