fixes for table integration test