Fix remote tests, add local

This fixes a major problem with the way tables were being read.
No, you're right - that should be removed