fixed broken Fscheme-dependent tests