Fix failing tests#1535

ihalaij1 merged 2 commits into

apluslms:masterapluslms/a-plus:masterfrom

reppuli92:test_fixreppuli92/a-plus:test_fixCopy head branch name to clipboard