Test fixes: need to create service registry differently