Add some tests I'd forgotten