More test cleanup.
Fixing tabletmanager.py.