fix test bug
small refactor
schema test