Fixes with test schema