add more tests, replace other hardwired Table