Updated scheme with new test