Restructured the Unit Tests