cleaned up SimpleRawTableScan and added tests