Fixed acceptance tests failures caused by: MIFOS-5980
Merge pull request #273 from lukgas6/MIFOS-5980

Fixed acceptance tests failures caused by: MIFOS-5980