Cleanup extra scheams
Adjust expected types
merge nathanlws: Three small tweaks for FTS

Merge pull request #1162 from nathanlws/sql-layer/tweaks-for-fts
https://github.com/FoundationDB/sql-layer/pull/1162