Update unit test to run with both client and server