Fix test schema + couple of tests