Unit and integration tests added