Updated unit and integration tests