Updated scheme for testing