VE-1022: Little but improved support + fixed about 150 unit tests