Restructure tests