Restructure and format tests