Make client and server namespace aware
Update unit and integration test