cleaned up SimpleTableScan and added tests