Add tests I really should have written