Merge pull request #5490 from rohitwaghchaure/pos_testing_fix

[POS] Minor fixes