Added project and unit tests