merged the main and the test projects