[ALOY-913] Update test app for 1_5_X
Merge pull request #529 from feons/ALOY-913b_1_5_X

[ALOY-913] Update test app for 1_5_X