merge master
adjust tests count