Fix schemas on fnk.schema fns, and turn on validation in tests
Merge