Redo imports for yak namespace
Clean up schema test cases