Slim down number of tests

Mainly removing ones that are either root calls that aren't "important",
or others which will likely change if another test (which we kept) also
changes.