added additional projects and fixed unit tests