CI-63
fix tests

+review SYS-100