Merge "[VVP] Fix failing test in app_tests"