Alexander savenok add new tests and methods