make schema additive, fix tests