Bug/3032 supported services fix

You should merge #146 first.
This branch updates the test created in that pull request.