more tests, some schema fixes