More work
[#52359171] Working new art flow
Fixed tests