Get tests (mostly) working again