Fix regression in DBaaS tests

Change-Id: I4855c3254b7267ce34f3450be0290a0ce362f6f5
delay choosing client class