updated unit and integration tests