nject, tests, updates to schemas