TESTS: quick-test.r internal tidy up
TESTS: quick-test.r internal tidy up

iArnold/red,rheber/red,rheber/red,iArnold/red,NikolayShubenkovProgSchool/red,vehar/red,vehar/red,red-eco/red,red-eco/red,NikolayShubenkovProgSchool/red