revert accidental removal of a number of tests!