Adding new Test Project and other changes