cleaned up TableLoad and added tests