Updating schemas
Updated autotest.