Restructure test layout to mimic code layout