Unit test file restructuring