update schema, tweak tests for schema