fix tests + modify service