delete a bunch of stuff we do not actually need
small tidy-ups to tests