revert:delete broken tests and repair them