Restructure test descriptions
#initialize should be private