Updated test strategy