Misc. Cleanups

Reviews: @vinniefalco, @rec
It's no longer relevant: these tests were obsoleted by the new `Taker` / `BasicTaker` infrastructure which allows us to leverage the actual business logic we use instead of reimplementing it to run unit tests.