Revert pre-existing tests, having separated new stuff.