Adjust client test to new db mappings.