Add tests I have forgotten