Fixed all tests and schemas, except a few that need to be debated.