Added collapse/expand for itemized tests and completed alternative sort methods