Updated unit test and project file