[squash] to etap tests
[wip squash] to etap tests