Restructured tests file