restructure table columns for test