Updated unit tests and project references