Improved some test and fixed a schema typo.