fix test
Fix routing with databaseName
add routing with databaseName
Return to the New3 ServerClient (remove the wrapping until later time)
Fix for getting database name (this is UGLY and need to change)
return test to original state