Restructure tests test