Update app general test

Small test updates and fixes.