Restructure test #10 #6