fix WEB-3047 + test
+ Restore ignored tests