Restructured tests file
Improved tests