Updated schemes tests