Refactoring, fixes and additional tests#4040

vsuharnikov wants to merge 11 commits into

version-1.6.xwavesplatform/Waves:version-1.6.xfrom

additional-testswavesplatform/Waves:additional-testsCopy head branch name to clipboard