revert: add failing tests, removing old ones