[#123455] hacky

+ more tests