Added some fixes to test harness to properly setup tables