Reorganizing the libs in the test project