Restructuring the unit tests