LPS-39587

Hi @migue,

this is the second attempt with tests. Thanks to the test, I've found an issue about properties ordering.

Thanks!