move most test tables out of global scope