Added app info to client html and updated test to collect this info
Fix conflict