clean-up
starting to refactor the schema builder unit tests