[BUG #8185] introduce attic
[BUG #8185] remove unneeded function param
[BUG #8185] add more tests