Scheme tests fix