Restructure these tests