[task] bringing tests to actual versions and adjusting code to actual

needs