scale tests
merge
changed res