Update tests for deprecated scheme