Replaced service stub bundle
Improved test