wch Restructure tests