Fix for client side test failures (missing imports)