This reverts commit 605d338acc.
605d338acc
[ci skip]
reactivates all tests and writes more tests for it