Small typo fixes
Need a query model; stub in 1st tests