1) New stuff plumbed in.

2) A bunch of tests which are no longer relevant have been removed.