- [TESTS] again tests improvements