Revert "restore some tests"

This reverts commit c5308aa5669742cf7539a1ab79690ec152fbc017.