Client/server test app update with new architecture