Restructuring unit tests
Finished restructuring tests