Add more test for projects and make some fixes