revert: add failing tests, removing old ones

We could review this on the same desktop :)