LPS-50537 Unit tests
LPS-50537 I assume one must call mark before set