Cleaning up tests and schema to work with latest joi, lout