restore the reworked tests