Fix internal scheme tests