Remove duplicate
Typo
pending tests
Remove deprecation warnings
Display query when blowing up
Move context which caches table info down and load the table explicitly